Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1141

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3e0948a4aeaebcb640d1a0ff6359798931d6e714..3087e640c62feda424a9388d806068104c065d0d 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-03  Reiner Steib  <reiner.steib@gmx.de>
+
+       * gnus-sum.el (gnus-propagate-marks): Fix custom version.
+
 2008-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-summary-save-parts): Inhibit even more treatment

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index fd6ea06e8f80eb42e94eba6a2f48f921fbe72c4d..d529f5ae23994f23d699a6430b9060706e1836e2 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1210,7 +1210,7 @@ For example: ((1 . cn-gb-2312) (2 . big5))."
 
 (defcustom gnus-propagate-marks t
   "If non-nil, do not propagate marks to the backends."
-  :version "21.1"
+  :version "23.1" ;; No Gnus
   :type 'boolean
   :group 'gnus-summary-marks)